]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
loginDialog: Realign list of batch tasks
authorRay Strode <rstrode@redhat.com>
Wed, 14 Apr 2021 13:31:40 +0000 (09:31 -0400)
committerRay Strode <rstrode@redhat.com>
Fri, 23 Apr 2021 19:56:22 +0000 (15:56 -0400)
The way the batch tasks are currently aligned doesn't jive with
with eslint likes.

This commit moves it over a bit.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1809>

js/gdm/loginDialog.js

index 6f66a275924481960668921afc78f4e1d58ca50c..cbc23c56d220cde36602608f386eeb5edb6d4dfc 100644 (file)
@@ -1048,54 +1048,56 @@ var LoginDialog = GObject.registerClass({
         let loginItem = null;
         let animationTime;
 
-        let tasks = [() => this._waitForItemForUser(userName),
-
-                     () => {
-                         loginItem = this._userList.getItemFromUserName(userName);
-
-                         // If there is an animation running on the item, reset it.
-                         loginItem.hideTimedLoginIndicator();
-                     },
-
-                     () => {
-                         // If we're just starting out, start on the right item.
-                         if (!this._userManager.is_loaded)
-                             this._userList.jumpToItem(loginItem);
-                     },
-
-                     () => {
-                         // This blocks the timed login animation until a few
-                         // seconds after the user stops interacting with the
-                         // login screen.
-
-                         // We skip this step if the timed login delay is very short.
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD) {
-                             animationTime = delay - _TIMED_LOGIN_IDLE_THRESHOLD;
-                             return this._blockTimedLoginUntilIdle();
-                         } else {
-                             animationTime = delay;
-                             return null;
-                         }
-                     },
-
-                     () => {
-                         // If idle timeout is done, make sure the timed login indicator is shown
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD &&
-                             this._authPrompt.visible)
-                             this._authPrompt.cancel();
-
-                         if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
-                             this._userList.scrollToItem(loginItem);
-                             loginItem.grab_key_focus();
-                         }
-                     },
-
-                     () => loginItem.showTimedLoginIndicator(animationTime),
-
-                     () => {
-                         this._timedLoginBatch = null;
-                         this._greeter.call_begin_auto_login_sync(userName, null);
-                     }];
+        let tasks = [
+            () => this._waitForItemForUser(userName),
+
+            () => {
+                loginItem = this._userList.getItemFromUserName(userName);
+
+                // If there is an animation running on the item, reset it.
+                loginItem.hideTimedLoginIndicator();
+            },
+
+            () => {
+                // If we're just starting out, start on the right item.
+                if (!this._userManager.is_loaded)
+                    this._userList.jumpToItem(loginItem);
+            },
+
+            () => {
+                // This blocks the timed login animation until a few
+                // seconds after the user stops interacting with the
+                // login screen.
+
+                // We skip this step if the timed login delay is very short.
+                if (delay > _TIMED_LOGIN_IDLE_THRESHOLD) {
+                    animationTime = delay - _TIMED_LOGIN_IDLE_THRESHOLD;
+                    return this._blockTimedLoginUntilIdle();
+                } else {
+                    animationTime = delay;
+                    return null;
+                }
+            },
+
+            () => {
+                // If idle timeout is done, make sure the timed login indicator is shown
+                if (delay > _TIMED_LOGIN_IDLE_THRESHOLD &&
+                    this._authPrompt.visible)
+                    this._authPrompt.cancel();
+
+                if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) {
+                    this._userList.scrollToItem(loginItem);
+                    loginItem.grab_key_focus();
+                }
+            },
+
+            () => loginItem.showTimedLoginIndicator(animationTime),
+
+            () => {
+                this._timedLoginBatch = null;
+                this._greeter.call_begin_auto_login_sync(userName, null);
+            },
+        ];
 
         this._timedLoginBatch = new Batch.ConsecutiveBatch(this, tasks);